Fix 'describe-variable' for longish variable values

* lisp/help-fns.el (describe-variable): Don't accidentally remove
the last character of a variable's value.  (Bug#25545)

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index edbcd9099d38db4d84d1d1ce2f37fdbf863091cc..742c66919af80a822f16f1885322dac63ca67d66 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -852,7 +852,7 @@ it is displayed along with the global value."
                    (terpri)
                    (pp val)
                     ;; Remove trailing newline.
-                    (delete-char -1))
+                    (and (= (char-before) ?\n) (delete-char -1)))
                  (let* ((sv (get variable 'standard-value))
                         (origval (and (consp sv)
                                       (condition-case nil